Merge branch 'master' into jsonrpc-refactor

diff --cc lisp/progmodes/eglot.el
index 70d133bc49fbaa74916315fbbe80ea49a6894ac9,4d3a46970e3b3bf36c716693854357f2436028c1..60a03228dd16d9056e20886951de44920b87003a
--- 1/lisp/progmodes/eglot.el
--- 2/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@@ -1316,10 -1635,10 +1328,10 @@@ If SKIP-SIGNATURE, don't try to send te
               ((and (memq action '(created changed deleted))
                     (cl-find file globs
                              :test (lambda (f glob)
-                                     (string-match (wildcard-to-regexp
+                                     (string-match (eglot--wildcard-to-regexp
                                                     (expand-file-name glob))
                                                    f))))
 -              (eglot--notify
 +              (jsonrpc-notify
                 server :workspace/didChangeWatchedFiles
                 `(:changes ,(vector `(:uri ,(eglot--path-to-uri file)
                                            :type ,(cl-case action